refactor(theme): align with upstream shadcn tanstack start#6
Merged
ramonclaudio merged 2 commits intomainfrom Apr 23, 2026
Merged
refactor(theme): align with upstream shadcn tanstack start#6ramonclaudio merged 2 commits intomainfrom
ramonclaudio merged 2 commits intomainfrom
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Swap the local
ThemeProviderfor the canonical shape merged in shadcn-ui/ui#10396 and drop the redundantnext-themesdep.The upstream docs ship a provider that uses
ScriptOncefrom@tanstack/react-routerto inject the FOUC-guard script before hydration, a mount flag to defer effects past SSR, and auseThemethat throws when used outside the provider. Our version is now a byte-for-byte match apart from onereturn undefinedto satisfy oxlint'sconsistent-returnrule and oxfmt-driven whitespace.Toasterpreviously pulleduseThemefromnext-themes, which was the only consumer of that package. It now reads from the local provider, sonext-themesis gone frompackage.json.Separately,
.oxfmtrc.jsonnow excludesconvex/_generated/**sobun run fmtstops fighting Convex codegen (the generator rewrites semicolons on everyconvex dev).src/components/theme-provider.tsx: rewrite to matchshadcn-ui/ui#10396(mount flag,getThemeScript,applyTheme(theme), throwinguseTheme)src/components/ui/sonner.tsx: swapnext-themesfor@/components/theme-provider, drop"use client"package.json,bun.lock: removenext-themes.oxfmtrc.json: addconvex/_generated/**toignorePatterns